- refactoring
- added some getters/setters