Remove code obfuscation, please don't revert my changes without discussing it first. [smf]