[kusi] Simplify and improve