Moved static vars back into class.