Refactoring all my casks