Fixed PSR-2 violation in the Map objects.