minor drawing code cleanup