Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: P. L. Lim <01b0ff1ff6bf52826e8c867754553ed4806180a6@users.noreply.github.com>
ejeschke/ginga,naojsoft/ginga,ejeschke/ginga,ejeschke/ginga,pllim/ginga,pllim/ginga,naojsoft/ginga,pllim/ginga,naojsoft/ginga