Issue 289: code review updates

Did required code review changes for issue 289.