Better naming of kirk globals and spacing of drawmap function