Renames
Renames
Renames
Renames
Renames
Minor rename, extracted code for re-use
Reduce the usage of tuples in favour of case classes
replace seq() with seq.empty to make the intention clear