Converted all draw tools to static classes