Removed magic numbers from the class Map