[issue #176 #170 #169] [review] fixes the code review comments