Ben code review
Refactored most of the code review TODOs