More cleanups for comments and variable names.