Minor refactoring to pip section.