The great refactoring (99%)