make WorkPackage.count_and_group_by private
WorkPackage model: Improve formatting