Comments and formatting cleanup