Improve notation
Clarify function return values