Сode refactoring cat