refactorging activities