[issue #176 #170 #169] [Fixed] fixes code creview comments