Refactoring of expressions

- Corrects examples