commenting refactoring i guess