Working on draw map function.
Cleaning up.