Refactor to reduce pipeline verbosity - part 2