Tidied up some Draw code