A bit of refactoring
Updated ember js