code cleanup per code review requests