PEP-8 improvements ...

Automatically validated PEP-8 using `autopep8` tool and done some manual validations where needed.