Working on sampler
Removing usages of 'volatile'
Code cleanup