cleanup per code review