Refactoring + refreshing table with newly received data