[#858] comment clean up
[#1732] astyle cleanup
[#2041] pep8 compliance

as enforced by the new packaging/run_autopep8.sh script