Shuffle some code to clean things up a touch