pep8 cleanup
connect/disconnect