Revert "Code clean up"

This reverts commit 7d3bc01d808e675d731f1148350572b765231786.