GUI-1040
code review cleanup