Merge "Minor refactor, deanonymize IntenalService class." into main