Moving the account view handling out to a different class