Minor refactoring
Rewrite
0.1.0