MP: Simplify loop and remove extraneous variables:w