Mapping debug: duplicate entities #296
   - minor code style fixes