Simplify formatting.
Rename augroups.