Revert "Code clean up"

This reverts commit 6d314315bd4aa87e0e33a776f0989f2bd9c82dda.