clean up code review issues