cleaned up some contrller.