Intensive Refactoring