Some refactoring
v0.0.2