some quick cleanup