App: Could not resist a light refactoring, #nfc.