I guess I don't need to declare var as much

Took all references to far out of all uses of a variable after the
variable had already been initialed