Got rid of some local vars.