Wip refactor about expressions
Refactor with expressions to improve preferences