Update Bridge to use instances correctly.

Also big cleanup.
Signed-off-by: Chris Sanders <zidane@outlook.com>