KO refactoring