Re-organize drawing functions.