misc style fixes
misc fixes