Refactored Activities