Minor modifications based on comments