PEP8'ing stuff