refactor: move duplicate code into methods GitOrigin-RevId: e47e7e758bfc48537f0f21d40cef8e5fa2a076c6 Change-Id: I413a0865c2bc6d24951048d74019ddb1ea62881c