Revert "Code cleanup"

This reverts commit 338e01e90c6a62f3e82b9e57a4be78577d1c499a.