Modify comments and remove a duplicated statement.