Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Derek Homeier <955e65eba8e58aa01aa289170b3c5b72f3c4064d@gwdg.de>
mhvk/astropy,astropy/astropy,astropy/astropy,mhvk/astropy,mhvk/astropy,astropy/astropy,pllim/astropy,pllim/astropy,pllim/astropy,pllim/astropy,mhvk/astropy,astropy/astropy,pllim/astropy,mhvk/astropy,astropy/astropy