Inline comments and syntax cleanup.