[UI-Master] Clean code