Some minor drawing cleanup (I know I know. Still unused.)