WIP cleaning up methods in DataGrid