Tidied up some CAD plotting routines