Cleaned up the edit and extractheadercells