MovieScaper cleaned up