Fix PEP errors

Fixes some PEP errors.

Please make sure that your PR's don't contain any build errors before merging it to master.

Thanke you.