autopep8 - ing the codes from PR 162