refactoring
0.2.1