Refactor cat.