refactor for v0.2.0