Refactor table to decrease the nr of duplicate stuff