Kitty Pryde/Refactor