Fixed pmd violations in MapHandler