Tidying and add dt avg to world state