pep8 compliant, a few more tweaks
changed URL, email