[REF] account: refactoring made during code review