[issue #353] [Fixed] fixes the code review comments