Cleaning and URL fix

Cleaning and URL fix