syntax and formatting changes - no changes in logic