small refactor and cleaning
- moved protected variables to const
- moved locations to static variable with getter
- some code cleaning and styling