Revert "code cleanup"

This reverts commit 314e7ed45e0d6fd0b0b88b3e078564f0aa1974ab.