some style cleanup
some more style fixes