Refactored contracts controller
Refactored locations controller partially
Took code out of users show view