Update awscli.py with better format