Cleaned the codes. Refs #9358.
Merge branch 'feature/9358_gen_peak_enhance' into develop