cleaning up some minor things