- update documentation
- small refactoring to make it... smaller!