Revert "Code cleanup"

This reverts commit fa5f7608ac358d7664f661151e2a87ccd355fbeb.