Cleanup and correction

General code cleanup.
Word count text formatting is now handled by JJPluralForm so that they
can be localised correctly in the future.