refactoring
0.1.7