Clean up, merge square/maximum-awsome