comments/minor refactor