commenting/refactoring