Reshuffle some code around