Refactoring OMXApplication