CLOUD-39 small style fixes