refactor v0.1.1