refactoring towards betterness