More refactoring + import python-keyring-lib (from my repo)