comments and small refactoring (renaming)