Clean up markup and URL