Cleaning up, some rearranging