Welding cleaned up to be less... opinionated