Code review comment incorporated and fixes for #308