Group variables with corresponding comments; Improve comment detail.