Minor code style fixes