Minor cleanup.
Use new AWS cli tools.