Cleaning up the code base