Various stylistic changes, some AWS pieces