Refactoring command disks -> cats