Further rubocop tweaks