sane PEP8 modifications