- added namespaces
- small coding-standard refactoring