Removing class variables in favor of class-level methods