20140127 Code cleaning in SMP-12-017 rivet analysis