Change parameter order
Turn comment into a TODO
Fix bug in json_attribute2
Inline method
Rename method
Rename method parameter (to avoid confusion)
Swap parameter order
Add default parameter value
Move both methods that use valid_fields together
Rename a couple of things
Move methods that do some type of recursion together