Simplify loading of credentials
Remove console logging
Minor clean up