Minor code cleanup
Minor code cleanup
Support HDFS federation.