Refactored ActivityUtil class
small refactoring change
Merge branch 'refs/heads/refactoring' into april_tasks