clean up code from code review