cleaned source file and URL handling