Commenting and tidy-up pass