More code consolidation

No net new functionality - just code smushing