JAVA-465 code style issues