PEP8 mutliline conditional cleanup