Removing inappropriate reference to owner field
Pyflakes appeasement
Tweaks