User code clean and ui improve