Ember refactoring.