Split out a couple variables. Too late to do other stuff though.