Refactoring -> ListingService and AccountService