Refactor expressions