Minor code cleanup

I simplified a few if statements and ran `go fmt` on the files that I modified. 
Aside from removing the comment, the changes to this file should be reverted, sorry :/ :
1) we don't want to allow garbage like httphahalolnotarealscheme://example.com
2) lines 45-52 need to be after line 72, because we re-assigned the URL there