A bit of cleanup

Some minor stuff I didn't include in my last PR.