clean up some minor things