Commenting and code formatting