some code style fixes