addressing further review comments by @aledsage to previous pull request