Improve code formatting

This is an entirely cosmetic change that converts the 4 spaces per tab
to 2 spaces per tab, wraps some long lines at 80 characters, and aligns
some values to improve readability.