Renamed ColumnTable to Table. Other minor cleanup.
Cleanup