Moves things around for clarity