small enhancements

- encapsulated attributes from configuration class
- small performance improvements
- some comments were improved