Improve notation