clean up draw code a bit