Refactor to use less temp vars
Refactor last(?) unneeded temporary variables
Refactor and spiff-ify