The great refactoring (50%)