refactoring
some refactoring
Merge branch 'feature/add_activity-41' into staging