WIP.  Code cleanup and documentation.  Function rationalization WRT *content.