Revise P1 from a function definition to an expression