Fix comments in PR #1495

@ashnazg here are the fixes for your comments in PR #1495