ember-data update, small refactor