Simplify area drawing code a little