Reorder code in a slightly more logical way