More refactoring to picking up items