Refactor kas models