small bits of additional cleanup