Minor refactoring for L2 App translation