PEP8 and tidy