Small refactoring for key locations and items.