Code cleanup and enhancements of Cells Worksheet