Minor clean up, still working on getSubtitles.