Short URL tidying up