Addressed PR 391 comments