Added white space strip and reformatted urls