Shuffle around some code