improved comments and whitespace.