ID obfuscator/code cleanup