Define/Assign UI - Code cleanup