added comments on where to refactor