HDFS-5615: refactor