Refactoring
v0.2.0