Move changes pointed out by the reviewer.