Revert "Code cleanup"
Revert "Code cleanup"

This reverts commit 4ad2eb8da914804b989b046aa9fdecb230c64c40.

timble/kodekit-platform,nooku/nooku-platform,timble/kodekit-platform,timble/kodekit-platform,timble/kodekit-platform,nooku/nooku-platform,nooku/nooku-platform,nooku/nooku-platform,timble/kodekit-platform,nooku/nooku-platform