LPS-22792 Minor refactors