clean up code for blocked sampling
change dict syntax