PEP8 compliance (mostly)