misbehavin cleanups
all of me, minor clenaups in misbehavin