Removing remaining rubocop gripes