comment and improvment