cleaned up draw manager