Refactored Cat class.  Less garbage