Simplify connection

This is applied on top of the pep8 branch but could easily be applied without. It could also be merged cleanly on top of the standardize-date branch.

Happy to re-org the pull requests however you like to make life simplest.