Refactoring: renaming and comments
Refactoring