Cleaned up the drawing options