Email/phone obfuscation, general cleanup