Fix new-Rubocop style violations