Minor clean up
Added Drawing, Point