Revert "code cleanup"

This reverts commit 7c733567847776eb2ce98e11f07c0392a1b1172d.