Removing some AWS variables, and adding a nicer description comment