Refactor KIF To use new methods, update type into method.