Revert "Code cleanup"

This reverts commit 4e516653b228e3fa6d4e454ea51d905a5b6bcf0d.