little bit of refactoring
0.0.4