refactoring aller activitys