Make a greater distinction between 'do data refresh' and 'after completion of data refresh' logic