Expanded tabs to spaces and set indentation to 2 spaces per Hadoop's cod...

...ing conventions in remaining a couple of places.