time to start cleaning up the code