Updates

Rubocop testing, some nice changes, some not.
Unused parameters are prefixed with underscore, thats in our style guide