COMP: move member variables that are really local temps out of class & into method
COMP: cleanup