HDFS-5616: code review cleanup feedback