Tweak notation
Improve naming