small cleanup and refactoring
release v0.1.0