Refactoring (v0.0.6)