GH=113 Edits based on code review feedback