Cleanup and rearranging things