v0.1.x: minor refactor