Moved some Fields to Local Variables

Fields only used in single methods and that didn't need to have values
preserved between calls were moved.