no class variables

replaced class variables with class func