Make aws --help output more helpful
Tidy up aws function