a few small clean ups

no major changes