refactored a bit
0.2.0