issue 39: fix code review