OOP: some minor changes

Added BinaryMarkerDispatcherKiller and renamed PainterAdapter interface
to just Painter