DDBNEXT-27: refactor code

  - remove debugging message
  - indent code