cleanup based on code review