minor cleanup

Just some minor things