clean up from code review