Addressed code review comments

#669