Added more Tutorial hints
Refactoring (getters/properties) and comments