Some refactorings and Ember update.