Revert "Remove comments and use Enum CellType"

This reverts commit a564321b8c843695e4461656cb8ec275acbc09f4.