Harmonizing use of this and cleaning up pipeline initialization