Refactoring. Dangerous.