code review cleanup 1