really minor pep8'ing
little bit of refactoring so code consistent
type in key store from cred_v1.0 to creds_v1.0