few change to help minification/obfuscation