Revert "Code improvement"

This reverts commit 6b12178adf14c2adce04733e08496e724a0f8b20.