Refactor cat