PEP-8 before working on #99