Added by Rob Nahf about 11 years ago
code cleanup or merge code and minor refactoring for cleaner separation of responsibilities.