Fix PEP8 nitpicks