Refactor IntentExtras->MainActivity