redoing to streamline