Revert "code cleanup"

This reverts commit 036a343685b91a842337c1a439787ff21118681a.