Refactoring! Ha!