Refactor by using ember-query