Code cleanup and enhancements of Cells Workbook