Issue #423 Fixed code reviewer's comments again