Refactored expressions