Cleaned up service, improved video string url