code cleanup prior to code review