Factoring out a couple more common variables.