Storm DRY

Storm DRY