streamline iteration termination a bit