Revert "Code cleanup"

This reverts commit a36c8e6a38a4370ad57f098efdf3733e7843d9b0.