Improve notation
Improve naming