Clean up DrawLine some more