Code cleanup and enhancements of Cells Extractor