[fold] cleanups suggested by #768 review.
* exports, variable names, comments