Cleaning up the code for development