Refactored cat