Minor cleanup fixes - comments and variable names.