refactoring Activities