Address PEP8 compliancy issues