Addresse PR #198 comments