Minor refactor before major changes
Minor refactor before major changes

aleksandr-bakanov/astropy,lpsinger/astropy,funbaker/astropy,saimn/astropy,joergdietrich/astropy,stargaser/astropy,pllim/astropy,AustereCuriosity/astropy,saimn/astropy,aleksandr-bakanov/astropy,larrybradley/astropy,pllim/astropy,lpsinger/astropy,joergdietrich/astropy,mhvk/astropy,tbabej/astropy,DougBurke/astropy,larrybradley/astropy,stargaser/astropy,MSeifert04/astropy,mhvk/astropy,bsipocz/astropy,DougBurke/astropy,joergdietrich/astropy,lpsinger/astropy,tbabej/astropy,astropy/astropy,mhvk/astropy,funbaker/astropy,dhomeier/astropy,StuartLittlefair/astropy,StuartLittlefair/astropy,MSeifert04/astropy,AustereCuriosity/astropy,aleksandr-bakanov/astropy,kelle/astropy,bsipocz/astropy,bsipocz/astropy,astropy/astropy,dhomeier/astropy,kelle/astropy,astropy/astropy,DougBurke/astropy,larrybradley/astropy,dhomeier/astropy,AustereCuriosity/astropy,funbaker/astropy,dhomeier/astropy,kelle/astropy,astropy/astropy,kelle/astropy,stargaser/astropy,AustereCuriosity/astropy,stargaser/astropy,mhvk/astropy,lpsinger/astropy,mhvk/astropy,joergdietrich/astropy,tbabej/astropy,tbabej/astropy,kelle/astropy,pllim/astropy,astropy/astropy,pllim/astropy,funbaker/astropy,saimn/astropy,dhomeier/astropy,larrybradley/astropy,saimn/astropy,StuartLittlefair/astropy,tbabej/astropy,saimn/astropy,joergdietrich/astropy,DougBurke/astropy,StuartLittlefair/astropy,AustereCuriosity/astropy,bsipocz/astropy,StuartLittlefair/astropy,larrybradley/astropy,lpsinger/astropy,MSeifert04/astropy,MSeifert04/astropy,pllim/astropy,aleksandr-bakanov/astropy