PeakExtractor and PeakCrossExtractor refactored

PeakExtractor and PeakCrossExtractor refactored