Refactor to reduce pipeline verbosity