Updates to address issues in comments