DACA2: little cleanup of aws script