- small refactoring (renaming methods and constants)
- commented out some logging lines