v0.0.8: better refactoring