code review clean up