Shuffling code around