Some polishing following PR #3384
2 files changed