Code cleanup and enhancements of Cell Converter