Refactored Activity