remove unused variables
create url class
more url class refactoring