Commenting and simplification