Move remaining subtitle functions to separate file