fixed some PMD violations in MapHandler