Refactor recent additions.  Code cleanup.