PEP8 and Lint Fixes