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