fixed some obfuscating code