Improved comments and whitespace.