Refactoring Unity