cleaned up user controller and model