Minor changes to address review feedback