Refactoring + almost ready subtitles