last refactor to take advantage of IAM Role benefits with cli.