Integrated suggestions in PR #507 comments