- peak2peak measurement and refactoring