clean-up after refactoring
0.0.1