cleanup from code review comments