refactored emberjs model a bunch