Some code style fixes