v0.5.x: minor refactor