v0.1.x: refactor