CleanUp
Fix url