Refactoring to conform to ember conventions