improve readability of codes and fix bugs caused by confusing codes
improve readability of codes and fix bugs caused by confusing codes

FAANG/faang-portal-backend,FAANG/faang-portal-backend,FAANG/faang-portal-backend