Revert "Code cleanup"

This reverts commit 38058f3b8daffec934aafe36fc8bc59428c8e022.