refactored class vars