Fix code review issues from PR #30#31

jeremyeder wants to merge 2 commits intoambient-code:mainambient-code/reference:mainfrom

jeremyeder:fix/pr30-review-issuesjeremyeder/reference:fix/pr30-review-issuesCopy head branch name to clipboard