Fix pep8
pep8 changes
Add support for keyring