0.0.9 minimal refactoring