CleanUp and url fix