finish movie service & refactoring code