URL Shortener - make it better