[WIP][issue #206] fixing reviewers comments