Fix style issues found by new rubocop version