Improvement on AddActivity - useless code deleted/refactoring