refactor & polish for v0.1.0