GUI-554
minor cleanup based on code review