Small code style fixes