Fixed Charm Pouch drop crash, some refactoring