changes as requested in PR feedback