Improve naming
Improve notation