Naming keys in params
Simplifying
Restructuring