Work with expressions improved and refactored