response to code review and a bunch of code cleanup