Cleaned the code. Refs #8518.
Merge branch 'feature/8518_fitpeak_eventws' into develop