refactoring activity feed