Refactored account activity