experiment with refactoring