Cli fixes

Minor cleanup to the AWSCLI module