Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Nathaniel Starkman <289866c9a0f517427c9b7c785e9eb0823a98d3e4@users.noreply.github.com>

pllim/astropy,StuartLittlefair/astropy,saimn/astropy,pllim/astropy,mhvk/astropy,larrybradley/astropy,saimn/astropy,StuartLittlefair/astropy,mhvk/astropy,astropy/astropy,mhvk/astropy,lpsinger/astropy,lpsinger/astropy,lpsinger/astropy,saimn/astropy,mhvk/astropy,pllim/astropy,StuartLittlefair/astropy,larrybradley/astropy,saimn/astropy,larrybradley/astropy,pllim/astropy,lpsinger/astropy,mhvk/astropy,saimn/astropy,larrybradley/astropy,astropy/astropy,StuartLittlefair/astropy,pllim/astropy,astropy/astropy,lpsinger/astropy,astropy/astropy,StuartLittlefair/astropy,larrybradley/astropy,astropy/astropy