Code clean up, refactoring of Gaussian classes.