Clean up style model
Make ember tests work