Remove top-level class variable access to fix warning