Cleanup
Refactor draw()