Misc cleanup

Just a couple of bits of cleanup I spotted while reading through