Tidy-up to be more consistent with Ember.js idioms