Some refactor
Merge branch 'master' of https://github.com/Vorgnr/Filmator.git