Surefire Pipeline view refactor