Refactored to comply with PEP 8.
Merge branches 'pep8' and 'develop' into develop