Code cleaning up for URL