Simplification refactor.  Found the repeated code, and removed.