Made World.on_draw() check for None. Fixed formatting