[xuite] Simplify and improve