Minor comments & refactor