Fix for subtitles datetime issue
Code cleanup.