issue-119: clean code