Streamline and optimize