Format source
Added url handling for variables