Refactored expression trees generation