moved movie data from app context to config
removed unused comments
cleaning up
merge