PEP8 applied partially