MAPREDUCE-5809: javadocs and refactoring
MAPREDUCE-5809: clean unneeded imports