Some refactoring
0.0.4