Refactor all stuff to do with users to make the controllers nice and thin