Variable name refactoring, rangedict changed to list