GUI-1199
code review cleanup