cleaning up a few minor things