Update by review suggestions