Fix more Rubocop problems
With Rubocop available: !1289 (merged), fixes more identified issues.
Once we are clear of issues, we can add this is a test to our pipelines/pre-push hooks etc.
With Rubocop available: !1289 (merged), fixes more identified issues.
Once we are clear of issues, we can add this is a test to our pipelines/pre-push hooks etc.