Last set of code review comments for unzoom.