Minor code updates for PIP8