I agree especially given how logically Bach structures his contrapuntal stuff. I also took a class on counterpoint and the professor had the great idea of using Gradus Ad Parnassum as our textbook. Very rewarding class but there's far more approachable books on counterpoint these days!