touchups, refactoring decodeURI done