Cask Format overhaul