enhance commentation