More expression refactoring to make code easier to read