Refactor
Add some ember tips