PEP 8 fixes

Minor tweaks bringing to address PEP 8 style issues.