Improving the FmeasureCalculator