Rearranging and cleaning up, maybe