Fix/odds n ends

Is this PEP8? I'm a bit surprised.  If so, +1. If not, -1.