Commenting and style changes