clean up some returns