"Improve" PasswordStores encryption code