Refactor ko to be more clear