Removed redundant null checks
Renamed variables to make them more understandable
Update previous commit
Fixed support for MovieInfo

Partially revert 69e3043 "Update some dependencies version"
Revert "Update previous commit"

This reverts commit 6074cfacb8ab4946f17700a51ab127b19126921c.
Revert "Renamed variables to make them more understandable"

This reverts commit 160cba5b273f1b9d5625decf441ad14e08b94e8c.