Map improvement and refactoring
  - handling
  - style
  - code

Signed-off-by: Felix <felix.herz@hotmail.de>