cleanup and more understandable url