The great refactoring (98%)