Subtitles stuff

Just tidied stuff up, made things look nicer, made the code cleaner,
etc.