Clean up and abstract out initial canvas code