checkin before refactoring
cleaning up PR reviewer's issues