Revert "code cleanup"

This reverts commit f71a4cc01ff5823f3fc101044717cfc3d013f490.