Streamline and simplify subtitle handling