Minor cleanup and reshuffling