Clean variables and add comments
Improve initial maps location