enhance in UI
Clean code