cleanup and change to renderDataTable
More cleaning