some code style fixes
some more style fixes