Code cleanup + ENABLE_JS_BRIDGE macro added