clean up better