Address review comments for PR #403