Make changes to clean up code for review