Refactoring of PS1
[fixes #1] Amplitude computation breaks line wrapping.