Replaced DataQuerier with DataGrouper. Modified dependent classes to match.
Fixed rubocop errors.
Removed debugging code.
Added DataGrouper.