The great refactoring (80%)