Revert "make the code more readable"

This reverts commit 232fea1ef6d542eb9a7892fcc7c4db2e436ec9b1.
make the code more readable