cleaned up some more variable declarations.