Clean, refacto and url update