Some refactoring
0.1.9