- Additional refactoring
- Fix compiler warnigns