Rubocop fixes

As before hopefully this will help out someone else besides from ourselves.