Cleaned up the codes.  Refs #7788.
Merge branch 'feature/7788_fit_peak' into develop