some more tidying and Mojo::URL