Clean-up of file URL variables and some comments.