cleaned the dodraw method down a bit.