More Rubocop warnings fixes