trivial adjustments to syntax and comments