refactored current_account method