Small refactoring. Change some notations to postfix.