Refactor #show_account