Refactor v0.0.2