[FOLD] Small cleanups from David seminar
.
.