Major refactoring victory