Refactor

To rewrite working code until it is broken in newer, more elegant ways.

"I refactored the module and now nothing works but it is clean."