Commenting and tidy