minor draw code cleanups