Working equipping and unequipping, refactoring