Add further checks
Remove single-line comment which messes with the REPL
Refactor to allow URL source