Updates

Rubocop testing, some nice changes, some not.
I haven't seen this syntax before, is it still a hash?