Cleaned up sunpy.wcs in preparation for a (possible) extension