cat refactoring!