cleanups from code review