Removing some code obfuscation