Refactoring like ze devil