-Better abstraction
- some additional single line fixes
- fix for spaces after string keys