OCD PSR
Started work on Users controller
Cleanup