Minor cleanup of mcmc / thermodynamics