Formatting update

Corrected various formatting issues, such as lines longer than 80
characters, improper indentation, etc.