Refactor by renaming dicts to _shelves