PEP8 compilance fixes