code cleanup
moved dump instructions to an atomic callback