renaming variables
removing the init of the map

[ci-skip]