Cleaned up users controller and model