Cosmetic improvements to AWS script