Make groupBy val declaration a bit more idiomatic of the project