polish and SolarFlareNic make into proper class