cleanup some minor things