Prepare to store multiple mappers for the gatherer
Calculate count of grouped results correctly
Reduce indent