Refactored Storm WordCount