Revert "Code-Cleanup"

This reverts commit 77a7b9e902b6c9024e706ac3451adf585431ec0d, reversing
changes made to f98634c2ea1ce3df426f75b0f7a21eacf17ab9e7.