Trivial whitespace/code reformatting
Simplify/standardize key and index terms