refactoring, niceified