Remove unused variables in the spectrum file.
Some code style changes and improvements.
Merge branch 'PlayerPRO5' into PP5-PreferenceRewrite