comments & refactor