simplify/shorten drawing code.

well, it's not final, but it is a bit shorter. (tiny steps...)