expressions - refactor
expressions - final touch