PEP 8 compliance.

Changed the coding so that it is in line with the recommendations given
in PEP 8 for Python sources by Guido van Rossum.
Merge branch 'feature/PEP8_compliance' into develop