Refactor kitty.