More refactoring

Test: unit
PiperOrigin-RevId: 195188099
Change-Id: Ie2273229c257a9a767715831c15d90a6985fdda8
6 files changed