[MODIFY] minor improvements