Fix remaining rubocop warnings