Minor format changes from the final code (freq, shift etc) and format changes for printing.