House keeping

Rearranging. No functionality changes