Clean up (+2 squashed commits)
Squashed commits:
[84045ef] jshint
[5f09f6f] Fix stuffs I broke
Fix more model breakage