Update according to review suggestions