added comments for refactoring suggestions