Cleanup and rearranging