Slant 6 Rebuild

... and cleanliness