Moved some static vars to class level

This feels more consistent with how we do things in the other classes.