cosmetic fixes

some cosmetic fixes