#164 code polishing
#102 cosmetic update for tests