37-cleanup from code review