MAHOUT-1500: re-applied review comments

.. which were lost in the noise!

Signed-off-by: Anand Avati <avati@redhat.com>