CE-933 Minor code style fixes