Review code1

Look at the changes.