Update per review feedback on #329