style cleanup
some style fixes