Additional functionality.  Code cleanup.