Refactored splitting out different movie types