Style cleanup, mark TODOs
Clean up handlers and views
Base model cleanup
Optimizations, cleanup, style cohesion