More notations + cleaning