PEP8 and conditional cleanup

In cases where I didn't use pythong --snap no setup.py was written out, so I fixed that and got rid of a bunch of duplicate logic.