Add some more comments and fix Bridge pattern