Fixed checking for http(s)
cleanup
cleanup