Cleaning up code for first code review