Improved formatting: 72 char lines, clearer comments