minor fixes and refactoring
removed credentials