cleaning up uatofe a bit