Minor cleanup

Some minor things I noticed while going over the code with @mlucy.