continued commenting / refactoring