Refactor draw method
Refactor out image generation