Cleaned up comments, vertical whitespace, and other odds and ends.