more code style fixes