Bokeh Shapes and code cleanup