Commenting and validation complete