refactor each pet