some small bits of cleanup