add index to users controller, clean up trips and user controller