v0.0.x: minor refactoring