Removed hard-coded width and height
Removed debug messages
Fixed code style
Merge remote-tracking branch 'origin/enhance_map_api' into next

* origin/enhance_map_api:
  Fixed code style
  Removed debug messages
  Removed hard-coded width and height