Clean up before adding getColumnName() method