Update draw module to use new coding conventions.