enable datatable again
code cleaning