Refactoring cats
Continuing refactor