Change url way and clean some stuff