Refactoring. Also makes turns a few 500s into 404s.
Refactoring