improved some notations