Reorgranizing canvas code
Updating canvas drawing code