fix expressions
refactor expressions