cleaned up some code
working DataTables