POD enhancements.  Code cleanup.