[misc] Minor refactoring for consistency