Cleanup and optimizing DotPresenter