- mini-refactoring

- prepare for release
- mini-refactoring

- prepare for release