Work on the code review/clean up