Refactor for shorter URL's