Further cleanup and supplemental edition

Boilerplate structure reorganized.
The supplement edition is for working on the extra functions that will
be used during the workshop assignments.