Refactored expressions into a single simple expression