refactoring: better names and comments
refactoring: better method names and comments