clean up getdata controller
clean up controller
minor clean up