Commenting and format changes