Clean up
More fixes to handle cell-based format in optimizer
Improved help text describing cell format