Minor modifications from code review