code cleanup prior to submitting for code review