Codestyle adjustments to Map class