Minor modifications based on review